Tidied up lint errors