Cleanup and added fork distance count