CST-3: A little code cleanup