Refactoring

added some comments
ommit java.lang. package in output
fixed method return value