Clean up code!!!