Removed old comments
Removed old comments
Refactoring