Cleanup with a typedef