Cleaned up algorithm differences between versions

New version not tested yet