implemented some hLint suggestions