Minor merging; removing tabs from source files