simplify NonNull stuff