Fixed few review comments

1 job for !89 with krveduru/goneexp in 10 seconds (queued for 5 seconds)
latest merge request