Some cleanup in the Clock module
Working on the plugin