Solved some lint issues