addressing feedback from code review - mostly style stuff