Nim Re-factoring