Following the original of course doesn't prevent us from cleaning up confusing code, though (outside of confusing game logic :-) ).