Working on Improving Padding

-- Starting to refactor code but my brain is tired.