Make more idiomatic
more backbone fixes