#819 - Fixed up codestyle issues