removing tabs, especially mixed tabs and spaces
merging Bryan changes