Some refactoring. Working on the combat text.