fixed spacing and javadocs