tidied up lint errors