Remove some lint from the code