Clean up for code review