Simplify cli module