Clean up the code I