minor clean up & simplification