Indentation and misc fixes

Use tabs please