uci: rework variable usage