use standard padding syntax instead of implementing our own

use standard padding syntax instead of implementing our own #1824