Refactoring out cleverness and replacing with readability