Start adressing review comments