- Added some Javadocs
- Code cleanup