Little cleanup, adjusted timings