Resorting and reformatting
Correcting javadocs