minor clean ups in Flaw