         private var zombieTurns:uint = 0;
         private var viperTurns:uint = 0;
 
-        public function DrawRobot(robotID:uint, type:String, team:String, overrideSize:Number = 0) {
+        public function DrawRobot(robotID:uint, robotType:String, team:String, overrideSize:Number = 0) {
             this.robotID = robotID;
-            this.type = type;
+            this.robotType = robotType;
             this.team = team;
-            this.maxEnergon = RobotType.maxEnergon(type);
+            this.maxEnergon = RobotType.maxEnergon(robotType);
             this.movementDelay = 1;
-            this.hats = new Array();
-            this.hatImages = new Array();
+            this.hats = [];
+            this.hatImages = [];
 
             this.actions = new Vector.<DrawAction>();
 
             this.overrideSize = overrideSize;
 
             // set the unit avatar image
-            var avatarClass:Class = ImageAssets.getRobotAvatar(type, team);
+            var avatarClass:Class = ImageAssets.getRobotAvatar(robotType, team);
             this.imageCanvas = new UIComponent();
             this.image = new Image();
             this.image.source = avatarClass;

            }
        }

        private function getUnitOffset(type:String):Number {
            return 0;
        }

        private function directionToRotation(dir:String):int {
            switch (dir) {
                case Direction.NORTH:
                    return -90;
                case Direction.NORTH_EAST:

            return 0x000000;
        }

        private function getUnitScale():Number {
            switch (this.robotType) {
                case RobotType.ZOMBIEDEN:
                    return 0.75;
                default:
