remove unnecessary ||= and replace with =