Code review suggestions implemented - issue #308.