Issue #25 - Code review changes
Issue #25 - Code review changes