Combat code cleaned somewhat.