Fixing CheckStyle issues for 0.3.0-SNAPSHOT release