Cleaning up ctypedef's