Clean up code and head