Clock finished

Cleaned up