Refactored a bunch of stuff using ReSharper