GJP-27: code review