implemented some more hLint suggestions