Code Cleanup: final in catch statement