refactoring
cli utility