Clean up redundancy in excepts