addressed code review issues by Daniel Lamb