more cleaning and modifications