For nice merging

please merge this!
Why there in some places spaces are used for indentation and in other places there are tabs? Please, do it indentically.