Remove comment
Refactor and (arguably) simplify.