minor cleanup to FWConfig