Clean-up + add support for transit format