Clean up code a bit.
Clean up code a bit.

corywalker/cas,corywalker/expreduce,corywalker/cas,cekdahl/expreduce,corywalker/expreduce,cekdahl/expreduce,cekdahl/expreduce,corywalker/expreduce,corywalker/cas