refactor of clock variables and added hands