GRILL-619 - Fixed review comments