cleanup and minor adjustments

cleanup and minor adjustments