Better class structure and little refactor in Character class