Refactoring of OPDAnalysis with better method names and added javadocs.