Reformat and refactor
Change now() and event handles
Change now() and event handles
Evolution on feedback