cleaning up

putting things in there place