VID-37 Addressed points brought up in code review/pull request.