Extracted Timer to a Utilities Class and applied timing closures as decorators on all functions that are timed.