Minor adjustments and cleanup