[Issue #205][WIP] Fixed reviewers comments