mini refactor command/options/locale