Corrects spelling, removes unused imports and methods, removes bad exception handling