Cleaned up pyflakes lint
Fixed lint and merged remote changes
Replaced error_exit with an Exception