Fix formatting(except for missing javadocs)