[MYHOARD-343] code review update