Minor indentation changes and more javadocs.