Tweaks to OO structure.