redid variables, and formating expressions