Made strings and responses more consistent