Reorder the methods of the class and remove useless javadoc. Part of #332 Contributed by Graham Russell