Cleanup and better generated aliases