Provided granular control over padding. Code clean-up.