Update README
Refactoring and Javadoc