Clean up code again