Shell vars style cleanup