Refactor code is now easier to read