Refactor, work on character feature spec