reindent old script
first passing tests