Cleaned up the org keys a bit.