Add some minor, cosmetic changes