Some random cleanups for help pfx