more cleanup due to pylint