renamed variables to more consistent style, compact hanging parens