Clean up (as requested by code review)