bit more cleanup

looks better, i also change some stuff and added stuff, read it over and confirm