Fix time unit + clean up