Readability refactoring