Removed unnecesary clutter