diff --git a/code/3DSLoader.cpp b/code/3DSLoader.cpp
index 914648ae8..18f927fe6 100644
--- a/code/3DSLoader.cpp
+++ b/code/3DSLoader.cpp
@@ -49,11 +49,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER
 
 // internal headers
-#include "3DSLoader.h"
-#include "Macros.h"
+#include "3DSLoader.h"
+#include "Macros.h"
 #include "../include/assimp/IOSystem.hpp"
 #include "../include/assimp/scene.h"
-#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
 #include "StringComparison.h"
 
 using namespace Assimp;
diff --git a/code/B3DImporter.cpp b/code/B3DImporter.cpp
index a2f8b5593..148f9c5ad 100644
--- a/code/B3DImporter.cpp
+++ b/code/B3DImporter.cpp
@@ -239,8 +239,10 @@ unsigned B3DImporter::ChunkSize(){
 
 template<class T>
 T *B3DImporter::to_array( const vector<T> &v ){
-	if( !v.size() ) return 0;
-	T *p=new T[v.size()];
+    if( v.empty() ) {
+        return 0;
+    }
+	T *p=new T[ v.size() ];
 	for( size_t i=0;i<v.size();++i ){
 		p[i]=v[i];
 	}
diff --git a/code/BaseImporter.cpp b/code/BaseImporter.cpp
index 6d073c5a7..4afa08daa 100644
--- a/code/BaseImporter.cpp
+++ b/code/BaseImporter.cpp
@@ -154,20 +154,26 @@ void BaseImporter::GetExtensionList(std::set<std::string>& extensions)
 		// read 200 characters from the file
 		boost::scoped_array<char> _buffer (new char[searchBytes+1 /* for the '\0' */]);
 		char* buffer = _buffer.get();
+        if( NULL == buffer ) {
+            return false;
+        }
 
 		const size_t read = pStream->Read(buffer,1,searchBytes);
-		if (!read)
-			return false;
+        if( !read ) {
+            return false;
+        }
 
-		for (size_t i = 0; i < read; ++i)
-			buffer[i] = ::tolower(buffer[i]);
+        for( size_t i = 0; i < read; ++i ) {
+            buffer[ i ] = ::tolower( buffer[ i ] );
+        }
 
 		// It is not a proper handling of unicode files here ...
 		// ehm ... but it works in most cases.
 		char* cur = buffer,*cur2 = buffer,*end = &buffer[read];
 		while (cur != end)	{
-			if (*cur)
-				*cur2++ = *cur;
+            if( *cur ) {
+                *cur2++ = *cur;
+            }
 			++cur;
 		}
 		*cur2 = '\0';
@@ -177,8 +183,9 @@ void BaseImporter::GetExtensionList(std::set<std::string>& extensions)
 
 
 			const char* r = strstr(buffer,tokens[i]);
-			if (!r) 
-				continue;
+            if( !r ) {
+                continue;
+            }
 			// We got a match, either we don't care where it is, or it happens to
 			// be in the beginning of the file / line
 			if (!tokensSol || r == buffer || r[-1] == '\r' || r[-1] == '\n') {
@@ -187,6 +194,7 @@ void BaseImporter::GetExtensionList(std::set<std::string>& extensions)
 			}
 		}
 	}
+
 	return false;
 }