Add O-terms separately
pep8 fixes