refactoring
[clenaup] improving javadoc