Fix 'Implicit conversion from enumeration type' compiler warning on OS X
Fix 'Dead store' static analyzer warning
Make method declaration styling consistent
Make indentation consistent