orbitalkiller: minor refactoring and tests