Changed all all string.* calls to method calls where appropriate