Refactoring code
Initial work on XLSX parser