make time retrieval a bit more compact, refactor abit to not need finishing else