padding, cleanup #37