Clean up code and stuff