Code cosmetic changes