few clean ups in utility