remove unnecessary code
remove some redundancy
small refactoring