some more random refactoring
Fog of war!