Refactoring
Javadoc comments
API Update