Made the characters code more OO.