Tidied up lint check errors