Fix for MSVC warning and some style fixes.