Nicer metric names because of #54 for #14
PEP8/pylint cleanup and more descriptive metric names