COoe tidy and more javadocs