modified formatting and variable naming