[Issue #372][Finished] fixed code reviewer comments