Faster epu-harness shutdown and pep8 cleanup