cleanups + Either methods to the Typed-API