#338 - PR review - cleaned up code.