Formatting

Some formatting fixes: spaces to tabs, indents, etc.