Got rid of toString, and camelcase/underscoring stuff