Minor cosmetic changes to padding