Made some lint fixes