Minor tuning and cleanup (MBP)