Added javadoc, cleaned up some leftover code/files