Removed unnecessary clutter