Fix some pylint stuff and be less ugly