#25: Code refactoring, by adding a Tools class.