Timing, documentation cleanup