readability refactor