Fix the inconsistency of spaces and tabs.

Please remember - tabs for indentation and spaces for alignment. If you don't do this everything gets messed up. This fixes past mistakes.