Code cleanup and javadoc