Cleaning up type aliases
fixup! Cleaning up type aliases