Removed timeFormat helper and moved logic to model