Fitting characters refactoring