Done a small code cleanup