Keep git happy (Inconsequential changes)
-Make \@ (date-and-time-formatting-switch) processing clearer
-JUnit tests for no-switch case