#284 - addressing code review comments

better formatting and variable names