prettied up stuff
more cleaning