Clean up some code to avoid visual clutter.
Clean up some code to avoid visual clutter.

cython/cython,da-woods/cython,cython/cython,da-woods/cython,da-woods/cython,scoder/cython,cython/cython,da-woods/cython,scoder/cython,scoder/cython,cython/cython,scoder/cython