Cleaning, fixing, naming