!fwait: Code cleanup