Removed "refactor for readability" TODO (and refactored for readability