Use 'this' where possible, see #88