pish tosh, cleaned up some stuff