Excel services refactoring