code clean up

fixing up some stuff