header simplification and remove tabs