more refactoring and remixable characters