Adress review comments