now looks better,clean up