Better names, refactor conditions.