#345 - Fixing Code Style issues so that SNAPSHOT build can be released