Refactor generate subcommand

Similar to #13 (closed) but for generate subcommand.