Cleaning up whitespace, removed unneeded exception class