Readability refactor