clean up checkin.conf, and pep8