Cleaned up CCI details output

Closes #48

Still cleaning up ordering output