Add fromMaybe
Trailing whitespace