Cleaning up some foratting items