Minor stylistic change, got tired of seeing s[0] in one place, *s in another :p