General tidy up.
Update tab width.