tidying up after mihai's feedback