Refactoring to make the code easier to read