Cleaned up some of the code.
Cleaned up some of the code.

sgiavasis/C-PAC,roijo/C-PAC_complexitytools,danlurie/C-PAC,sgiavasis/C-PAC,danlurie/C-PAC,danlurie/C-PAC,roijo/C-PAC_complexitytools,danlurie/C-PAC,sgiavasis/C-PAC,sgiavasis/C-PAC,roijo/C-PAC_complexitytools,roijo/C-PAC_complexitytools