Tried to fix the lint issues