- cleaned up some code