Added javadoc and cleaned up the code a bit