Clean up (see code review)