Improved formatting of script