Refactoring cli.
Imporove log message.
Merge pull request #5 from ama-ch/refactoring-cli

Refactoring CLI