Integrated EPPlus. Code tidy up.