Major refactoring is made with ReSharper