Refactoring
Code review and refactoring