Just a few quick cleanups. In particular, replaces a few manually added labels with 'title' property.
'title'