radar refactoring