removing tabs
Merge, fix tabs and typos