Fix review

fix review comments from Kalle