Refactoring. Remove warnings about non-nullable fields.
Reformat