Removed magic numbers
Changed scaling mode