clean up & minor changes