Some refactoring. Continuing work on implementing a combat system