Refactored

Just some refactoring with Resharper.