revert Yoda conditions; clean up doc blocks