Make refactoring, small improvements
Remove unnecessary boxing to Character