clean up
small changes