Fix commenting and method signature, per code review suggestions