Checkstyle compliance + Improved javadoc