Cleaned up the prime-factors-2 a bit