Fixed formatting and javadocs