More nullability and style fixes