Added comments
Refactoring