CLI simplification