cleaning, correctly dividing to private and public