cleaned up some excess clutter