diff --git a/class.go b/class.go
index d068ab2..d10d09f 100644
--- a/class.go
+++ b/class.go
@@ -11,7 +11,6 @@ import (
 	"text/template"
 
 	"github.com/PuerkitoBio/goquery"
-	"github.com/davecgh/go-spew/spew"
 )
 
 //go:embed class.tmpl
@@ -385,72 +384,50 @@ func parseMethod(s *goquery.Selection) (Method, error) {
 				return
 			}
 		} else {
-			if s.Is("div.indented") && state == 1 {
-				log.Printf("%#v", state)
-				parameter := ""
-				html, err := s.Html()
-				if err != nil {
-					Error.Printf("Error parsing html: %v", err)
-					return
-				}
-				html = strings.ReplaceAll(html, "\t", "")
-				htmlLines := strings.Split(html, "\n")
-				for _, line := range htmlLines {
-					if strings.Contains(line, "<span class=\"parameter\">") {
-						line = strings.TrimSpace(line)
-						line = strings.ReplaceAll(line, "<span class=\"parameter\">", "")
-						line = strings.ReplaceAll(line, "</span>", "")
-						parameter = line
-						continue
+			if s.Is("div.indented") {
+				if state == 1 {
+					parameter := ""
+					html, err := s.Html()
+					if err != nil {
+						Error.Printf("Error parsing html: %v", err)
+						return
 					}
-					if strings.Contains(line, "<br/>") {
-						comment := strings.TrimSpace(line)
-						comment = strings.ReplaceAll(comment, "<br/>", "")
-						for i := range res.Params {
-							if res.Params[i].Name == parameter {
-								res.Params[i].Comment = comment
-								break
+					html = strings.ReplaceAll(html, "\t", "")
+					htmlLines := strings.Split(html, "\n")
+					for _, line := range htmlLines {
+						if strings.Contains(line, "<span class=\"parameter\">") {
+							line = strings.TrimSpace(line)
+							line = strings.ReplaceAll(line, "<span class=\"parameter\">", "")
+							line = strings.ReplaceAll(line, "</span>", "")
+							parameter = line
+							continue
+						}
+						if strings.Contains(line, "<br/>") {
+							comment := strings.TrimSpace(line)
+							comment = strings.ReplaceAll(comment, "<br/>", "")
+							for i := range res.Params {
+								if res.Params[i].Name == parameter {
+									res.Params[i].Comment = comment
+									break
+								}
 							}
 						}
 					}
+				} else if state == 2 {
+					text := CleanUp(s.Text())
+					if text == "" {
+						return
+					}
+					// TODO: Figure out what to do when a function
+					if res.Returns[0].Comment != "" {
+						res.Returns[0].Comment += "\n"
+					}
+					res.Returns[0].Comment += text
 				}
 			}
 		}
 	})
 
-	// <div id="addCargo" class="codecontainer">
-	// 	<div id="addCargo" class="function">
-	// 		<p>
-	// 			<span class="keyword">function unsigned int</span> addCargo(<span
-	// 				class="type">TradingGood</span>
-	// 			<span class="parameter">good</span>, <span class="type">int</span> <span
-	// 				class="parameter">amount</span>) <br />
-	// 		</p>
-	// 	</div>
-	// 	<div id="addCargo" class="">
-	// 		<p>
-	// 			Adds cargo to the entity. If the amount specified exceeds the maximum capacity of the cargo
-	// 			bay, as
-	// 			much cargo as still fits in will be added.
-	// 		</p>
-	// 		<p><span class="docheader">Parameters</span></p>
-	// 		<div class="indented">
-	// 			<span class="parameter">good</span>
-	// 			TradingGood that is to be added. <br />
-	// 			<span class="parameter">amount</span>
-	// 			The amount of cargo that should be added. <br />
-	// 		</div>
-	// 		<p><span class="docheader">Returns</span></p>
-	// 		<div class="indented">
-	// 			<p>
-	// 				How much was actually added (can be less than amount when cargo bay is full)
-	// 			</p>
-	// 		</div>
-	// 		</p>
-	// 	</div>
-	// </div>
-
-	spew.Dump(res)
 	return res, nil
 }