Refactored Camouflager
Cleaned up some more useless strays