Renamed things to conform to PEP8
Added a sys.exit(1) I forgot