Added Javadoc and some checkstyle