Got rid of unnecessary checking in padder