[NGRINDER-691]Refactor ngrinder to be readable