cleaned some excess code up