Cleaned out unnecessary classes. Added Javadoc annotations.