- removed unuseful code
 - code refactoring