More refactoring and change character to *