[noticket] Small cosmetic changes