Tidy up code (from 4AM! mindset)