Tidying up to my taste