General Cleanup. Added Comments, JavaDocs, and removed relics of previous code.