Tidying

Some tidying before diving further into nullability.