Added more comments
Turned clock into an instanced singleton

Instead of a static method class... I guess instanced singletons are a
little better
Changed const variable to uppercase
Updated clock calls