Moved edgelength to simulated annealing phase + some cleaning up