orbitalkiller: refactoring