Adding EPPlus
Refactoring