tabs -> spaces again and code style fixes