cleaned up some excess code