Fix padding to conform + revert line removal