- clean up some code