Clean up, updates speedup