Tidied a few things, ReSharper recommendations