-Javadocs added on the class level describing usages
- Code cleanup