Clean up after code review by aha