Clean up register definition a bit