Misc cleanups

@fosdev Please review and merge!
Don't need begin end since this works and returns the value out of the enumerator block. Can just ||= each_enumerator..