Restructured Clock Stettings (fixed formatting)

See commit comments below for details