formatting and comment suggestions from code review PR#65