Clenaup & Bugfix @ CharacterScanner hierarchy