If you do clean up code, please put it in a separate commit, not mixed in with semantic changes. Thanks!