Cleaned up a bit the regression code by creating decorators. Still not satisfied