Converted all tabs to spaces in the code and removed left over commented code