Reformat NST
Full Resharper Cleanup