VC Clock: code cleanup