refactoring and bugfixes in XLS Readers