move time to line 1; simplify return code