Minor adjustments and cleanup.