Updating descriptions and cleaning up