Refactor, redesign: commands to expressions