Spykee made into service
SpyTank made into service
Refactoring