Removed more duplicate scale padding code