Modify style and javadoc