Cleaning up both Debug and non-Debug output

Works with prove -vf --timer in both Debug and non-Debug modes