Refactored with Resharper