[NotNull] fields write checks, prettify code