Updated scalariform
Added private[this] to some fields.