Clean up my code!