Update to elvis and orIfNull