WIP: Pull request 285 code review changes