Slightly naive handling of KeyboardInterrupt
Simple pep8 cleanup