Moved scaling methods into their own model