removed tests and renamed variables
made everything in parens be invoked as a function