Minor code reorg
Added POD [ci skip]