Removed ||= and replaced with = to improve clarity