Small refactoring, making the code easier to read.