J.W. cleaned up some code.