v. 1.0.7: code refactoring.