Many lint issues fixed