Attempt to tidy