Some tidy up using ReSharper
..