fix part of lint issues