Minor refactors for character