clean up up unused and formatting