Clean and tidy also private