Removed any unnecessary clutter