fixing most lint issues