[#4] PR comments fixes