Fix conflicts
Make methods string polite
See http://doc.rust-lang.org/guide-strings.html#best-practices