Removed unneeded exception type check
Cleanup, line length