cleaning up some stuff
tidying up stuff