- Remove echo and export command.
- Make some refactoring.