Cleaned up Clock and StandardClock classes