Improve formatting of script