Minor refactoring: moved out character instance