style changes, consistencies; variable name change