[32] refactored docme for better testing and more modularity