STYLE: Miscellaneous static analysis and other style fixes
Merge pull request #66 from jamiesnape/MiscellaneousStaticAnalysisFixes

STYLE: Miscellaneous static analysis and other style fixes