minor change and clean up