Cleaned some lint errors