Remove lint issues