Issue 44

Addressed code review issues.