Refactored code
More refactor