minor stylistic improvements to make script consistent