cleaned up way padding was handled