Cleanup. Comments. Commit.