Switch to ||= instead of silly return logic