Cleaned up Key stuff.