Clean up from code review