diff --git a/libsolidity/ExpressionCompiler.cpp b/libsolidity/ExpressionCompiler.cpp
index 67686df14..430e46b06 100644
--- a/libsolidity/ExpressionCompiler.cpp
+++ b/libsolidity/ExpressionCompiler.cpp
@@ -153,8 +153,9 @@ void ExpressionCompiler::appendTypeConversion(Type const& _typeOnStack, Type con
 	else if (stackTypeCategory == Type::Category::Enum)
 		solAssert(targetTypeCategory == Type::Category::Integer ||
 			targetTypeCategory == Type::Category::Enum, "");
-	else if (stackTypeCategory == Type::Category::Integer || stackTypeCategory == Type::Category::Contract ||
-			 stackTypeCategory == Type::Category::IntegerConstant)
+	else if (stackTypeCategory == Type::Category::Integer ||
+		stackTypeCategory == Type::Category::Contract ||
+		stackTypeCategory == Type::Category::IntegerConstant)
 	{
 		if (targetTypeCategory == Type::Category::String && stackTypeCategory == Type::Category::Integer)
 		{
diff --git a/libsolidity/ExpressionCompiler.h b/libsolidity/ExpressionCompiler.h
index c3ecabbd6..9cab757ea 100644
--- a/libsolidity/ExpressionCompiler.h
+++ b/libsolidity/ExpressionCompiler.h
@@ -26,6 +26,7 @@
 #include <boost/noncopyable.hpp>
 #include <libdevcore/Common.h>
 #include <libevmcore/SourceLocation.h>
+#include <libsolidity/Utils.h>
 #include <libsolidity/ASTVisitor.h>
 #include <libsolidity/LValue.h>
 
@@ -133,7 +134,7 @@ private:
 template <class _LValueType, class... _Arguments>
 void ExpressionCompiler::setLValue(Expression const& _expression, _Arguments const&... _arguments)
 {
-	solAssert(!m_currentLValue, "Current LValue not reset when trying to set to new one.");
+	solAssert(!m_currentLValue, "Current LValue not reset before trying to set new one.");
 	std::unique_ptr<_LValueType> lvalue(new _LValueType(m_context, _arguments...));
 	if (_expression.lvalueRequested())
 		m_currentLValue = move(lvalue);
diff --git a/libsolidity/LValue.h b/libsolidity/LValue.h
index 35ddc4515..bfa681a48 100644
--- a/libsolidity/LValue.h
+++ b/libsolidity/LValue.h
@@ -53,7 +53,7 @@ public:
 	/// Moves a value from the stack to the lvalue. Removes the value if @a _move is true.
 	/// @a _location is the source location of the expression that caused this operation.
 	/// Stack pre: value [lvalue_ref]
-	/// Stack post if !_move: value_of(lvalue_ref)
+	/// Stack post: if !_move: value_of(lvalue_ref)
 	virtual void storeValue(Type const& _sourceType,
 		SourceLocation const& _location = SourceLocation(), bool _move = false) const = 0;
 	/// Stores zero in the lvalue.