Refactoring to make the code more obvious.