Deleted more repeat code