removed some unnecessary clutter