Misc tweaks and cleanups
Added JetBrains.Annotations