Add: some code refactoring;
Change: handling of strings for printing.