Cleaning up and added ReSharper