Tidy to conform to attached rules