diff --git a/guide/04-damage.md b/guide/04-damage.md
index 7ba7c86f1e54211cf1bd11885adcc8eeecca72b2..98e9b7a1bb81519da91bfdb19ddeeb45409e0f2c 100644
--- a/guide/04-damage.md
+++ b/guide/04-damage.md
@@ -1,7 +1,7 @@
 [forrige](./03-toString.md)  • [oversikt](../README.md#steg-for-steg) • [neste](./05-attack.md)
 
-## Oppgave 4 - `damage`
-Implementer metoden `damage`. Metoden skal trekke i fra `damageTaken` fra antall `healthPoints` Pokémon'en har. Man kan ikke ha færre enn 0 `healthPoints`. Det skal ikke være mulig å gi negative skade, altså øke antall health points.
+## Oppgave 4 - `takeDamage`
+Implementer metoden `takeDamage`. Metoden skal trekke i fra `damageTaken` fra antall `healthPoints` Pokémon'en har. Man kan ikke ha færre enn 0 `healthPoints`. Det skal ikke være mulig å gi negative skade, altså øke antall health points.
 
 Metoden skal skrive ut (ikke returnere):
 ```
@@ -9,4 +9,4 @@ Pikachu takes 3 damage and is left with 84/94 HP
 ```
 (I dette tilfellet er Pikachu pokémon'en som tar skade).
 
-✅ Denne oppgaven er fullført når `healthPointsTest`, `damageTest`, `hpNotBelowZeroTest1`, `hpNotBelowZeroTest2` og `isAliveTest` passerer.
\ No newline at end of file
+✅ Denne oppgaven er fullført når `healthPointsTest`, `damageTest`, `cannotInflictNegativeDamage`, `hpNotBelowZeroTest1`, `hpNotBelowZeroTest2` og `isAliveTest` passerer.
\ No newline at end of file
diff --git a/src/main/java/pokemon/Main.java b/src/main/java/pokemon/Main.java
index 8bad6c44c180019fbdf8227daec1c2e220e75062..2d65f3986fd2e471db9f408e0966b150a3897d73 100644
--- a/src/main/java/pokemon/Main.java
+++ b/src/main/java/pokemon/Main.java
@@ -1,14 +1,12 @@
 package pokemon;
 
-import pokemon.Pokemon;
-
 public class Main {
 
     public static Pokemon pokemon1;
     public static Pokemon pokemon2;
     
     public static void main(String[] args) {
-        ///// Oppgave 6
+        // Oppgave 6
         // Have two Pokémon fight until one is defeated
     }
 }
diff --git a/src/main/java/pokemon/Pokemon.java b/src/main/java/pokemon/Pokemon.java
index a909df987ee1f3555f3c7f0c7c8b2358d963e81c..d753646bd526085bc7448d5e097e0f8f62079fe2 100644
--- a/src/main/java/pokemon/Pokemon.java
+++ b/src/main/java/pokemon/Pokemon.java
@@ -1,13 +1,13 @@
 package pokemon;
 
 public class Pokemon {
-    ////// Oppgave 1a
+    // Oppgave 1a
     // Create field variables here:
 
-    ///// Oppgave 1b
+    // Oppgave 1b
     // Create a constructor here:
 
-    ///// Oppgave 2
+    // Oppgave 2
 
     /**
      * Get name of the pokémon
@@ -56,7 +56,7 @@ public class Pokemon {
     }
 
 
-    ///// Oppgave 4
+    // Oppgave 4
 
     /**
      * The Pokémon takes a given amount of damage. This method reduces the number of
@@ -74,7 +74,7 @@ public class Pokemon {
         throw new UnsupportedOperationException("Not implemented yet.");
     }
 
-    ///// Oppgave 5
+    // Oppgave 5
 
     /**
      * Attack another pokémon. The method conducts an attack by <code>this</code>
@@ -89,7 +89,7 @@ public class Pokemon {
         throw new UnsupportedOperationException("Not implemented yet.");
     }
 
-    ///// Oppgave 3
+    // Oppgave 3
     @Override
     public String toString() {
         throw new UnsupportedOperationException("Not implemented yet.");