improved readability of time reporting and cleaned source