Refactoring
* comments added
* unused methods removed