\!fwait: Code cleanup