{Radio} refactoring