more nullity annotations + simplifying