Moved Excel based functionality to separate file
More refactoring