Cleanup syntax
Change time display to ms