cleaning up and messing up