made scaleFactor a real class, moved scaling to class