fixed to find shortest in results, cleanup
cleanup