Cleaned up a few things

Cleaned up a few things, also fixed an error in the AZ description.