Code refactoring.
User interface updated.