change comments; removed
remove multiple echoes and add indenting