Script: Improvements to formatting