[NGRINDER-697] Make code clean
[NGRINDER-703] Fix bug