Cleanup

Looks good to me.