Refactoring and add comments