added javadoc skeleton to the code, did some cleanup