Clean up, tune timing