Cleanup code (without making functional changes)