[Issue #93][Finished] fixed the code reviewer comments