[cbe] Cleanup whitespace, add types.