diff --git a/client/src/scenes/combat.cryps.js b/client/src/scenes/combat.cryps.js
index 70a57ba3..ac181aad 100644
--- a/client/src/scenes/combat.cryps.js
+++ b/client/src/scenes/combat.cryps.js
@@ -136,31 +136,27 @@ function renderCryp(scene, group, cryp, skills, game, team, iter) {
     return crypSpawn;
 }
 
-function renderSkills(scene, group, cryp, account, game, team, iter) {
-    const nameTextPosition = skillTextPosition(iter, 0);
+function renderSkills(scene, group, cryp, game, team, iter) {
     const skillList = [];
+    const nameTextPosition = skillTextPosition(iter, 0);
+
+    const addSkill = (skill, i) => {
+        if (i === 0) group.add(scene.add.text(nameTextPosition[0], nameTextPosition[1], cryp.name, TEXT.HEADER));
+        const skillTextPos = skillTextPosition(iter, i + 2);
+        const skillObj = new CrypSkill(scene, skillTextPos[0], skillTextPos[1], team, skill, cryp);
+        group.add(scene.add.existing(skillObj));
+        skillList.push(skillObj);
+    };
+
     if (scene.registry.get('resolve')) return true;
-    if (game.phase === 'Skill' && cryp.account === account.id) {
+    if (game.phase === 'Skill' && cryp.account === scene.account.id) {
         if (cryp.hp.base === 0) return true;
-        const crypName = scene.add.text(nameTextPosition[0], nameTextPosition[1], cryp.name, TEXT.HEADER);
-        crypName.text = cryp.name;
-        cryp.skills.forEach((skill, i) => {
-            const skillText = skillTextPosition(iter, i + 2);
-            const skillObj = new CrypSkill(scene, skillText[0], skillText[1], team, skill, cryp);
-            scene.add.existing(skillObj);
-            skillList.push(skillObj);
-            group.addMultiple([crypName, skillObj]);
-        });
-    } else if (game.phase === 'Target' && cryp.account !== account.id) {
+        cryp.skills.forEach(addSkill);
+    } else if (game.phase === 'Target' && cryp.account !== scene.account.id) {
         const blockSkill = game.stack.find(skill => skill.source_cryp_id === cryp.id);
         // cryp not casting this turn
         if (!blockSkill) return false;
-        const crypName = scene.add.text(nameTextPosition[0], nameTextPosition[1], cryp.name, TEXT.HEADER);
-        const skillText = skillTextPosition(iter, 2);
-        const skillObj = new CrypSkill(scene, skillText[0], skillText[1], team, blockSkill, cryp);
-        scene.add.existing(skillObj);
-        skillList.push(skillObj);
-        group.addMultiple([crypName, skillObj]);
+        addSkill(blockSkill, 0);
     }
     return skillList;
 }
@@ -174,7 +170,7 @@ class DrawCrypTeams extends Phaser.GameObjects.Group {
         const [enemyTeam] = game.teams.filter(t => t.id !== account.id);
 
         const renderTeam = (cryp, iter, team) => {
-            const skillsObj = renderSkills(scene, this, cryp, account, game, team, iter);
+            const skillsObj = renderSkills(scene, this, cryp, game, team, iter);
             const crypObj = renderCryp(scene, this, cryp, skillsObj, game, team, iter);
             const addKeys = (game.phase === 'Skill' && !team) || (game.phase === 'Target' && team);
             if (addKeys) scene.crypKeyHandler(crypObj, iter);
diff --git a/client/src/scenes/combat.js b/client/src/scenes/combat.js
index e7965edb..2e876e9c 100644
--- a/client/src/scenes/combat.js
+++ b/client/src/scenes/combat.js
@@ -3,7 +3,6 @@ const fs = require('fs');
 
 const { POSITIONS: { COMBAT }, TEXT } = require('./constants');
 const { DrawCrypTeams, CrypImage, CrypSkill } = require('./combat.cryps');
-const CombatSkills = require('./combat.skills');
 const renderResolutions = require('./combat.render');
 
 const CRYP_KEY_MAP = ['keydown_ONE', 'keydown_TWO', 'keydown_THREE'];
@@ -50,8 +49,8 @@ class Combat extends Phaser.Scene {
 
         this.registry.set('gameAnimating', false);
         this.account = this.registry.get('account');
-        this.log = this.add.text(logX, logY, '', TEXT.NORMAL);
-        this.log.setWordWrapWidth(logWidth);
+        this.log = this.add.text(COMBAT.LOG.x(), COMBAT.LOG.y(), '', TEXT.NORMAL);
+        this.log.setWordWrapWidth(COMBAT.LOG.width());
         return true;
     }