Refactor Character classes