Change static reference to self
Add annotations to the Body object
Clean up the Request class
Clean up doc blocks