Tab and script cleanup