cleaned up some code, running real smooth