[CLI-13] Code review changes #1