applied suggestion to save some ops