[#8] PR comments