Cleanup pod doc
Refactoring