Refractor code a bit
Add humanized time