Start moving things to methods on traits