Clean up code and name things better.