Remove tabs

Remove tabs and introduce first headers