Cleaning up API a bit till I implement other CIE types