Updated comment
Code refactoring