* Updated codestyle changes into checkstyle.
* Updated codestyle compliance (Part 1)