Refactor number generator
Add CLI