[issue #167][finished][fixing reviewer comments]