Bit of cleanup on Match.coffee