Xls refactoring