Cleared some lint errors