add @Nullable/NotNull annotations, cleanup with intellij inspections