Assign this inline
Remove outdated comment
Use ||= instead of unless