cleaning up some stuffs