PEP8 cleanup
update plotting and graph params
reorganized for efficiency and added metrics