[NGRINDER-688] Make code clean