Minor, use constants instead of hard-coded strings