whitespace fixes, tabify indentations to match git coding guidelines