Commenting and Tidying up code + fixes

- Commented and tidied DataReader.java
- Also fixed problem with xls and xlsx files getting stuck reading files
with multiple sheets