Minimize/clean up code.