Little code cleanup #part2