Post Review Clean up

Added Docblocks
Cleaned up test code