Refactor - mobo/character