Slight clean up of AnalogClockFace