minor adjustments and cleanup