More or less improve the mascot section code.