Shortened some code in combat form