Better organizing the keys