Quick change before meeting

It's never too early for code cleanup...