cleanup
formatting and time docementation