I cleaned up some of the common file