cleaned up some code from last commit