Code cleanup
Code updates for customizing clock/number