cleaned the code up some more