Tabs to spaces and header update