A little tune up and cleaning