diff --git a/source/eventy/event.d b/source/eventy/event.d
index 52b94ee..4f8781c 100644
--- a/source/eventy/event.d
+++ b/source/eventy/event.d
@@ -1,15 +1,13 @@
 module eventy.event;
 
-/**
-* Event
-*
-* FIXME: Rename this to `Trigger`
-*
-* An Event represents a trigger for a given signal(s)
-* handlers which associate with the given typeID
-*
-* It can optionally take a payload with it as well
-*/
+/** 
+ * Event
+ *
+ * An Event represents a trigger for a given signal(s)
+ * handlers which associate with the given typeID
+ *
+ * It can optionally take a payload with it as well
+ */
 public class Event
 {
     /**
@@ -24,4 +22,6 @@ public class Event
 
     ulong id;
     ubyte[] payload;
+
+    // TODO: Remove the requirement for the payload
 }
diff --git a/source/eventy/exceptions.d b/source/eventy/exceptions.d
index 9ecfe15..6ff9fd9 100644
--- a/source/eventy/exceptions.d
+++ b/source/eventy/exceptions.d
@@ -1,5 +1,10 @@
 module eventy.exceptions;
 
+/** 
+ * EventyException
+ *
+ * An Eventy runtime error
+ */
 public final class EventyException : Exception
 {
     this(string message)