[NGRINDER-697] Make code clean