Cleaning up type aliases