Cleaning up code (and beating Bryan)