Changed annotations namespace, add NotNull, CanBeNull annotations, cosmetic changes.