Things are now a little cleaner, also some added documentation

How does rick not know madoka I mean cmon