cleaned the code up some.