cleaned up some code#