Alan Hogue Minor refactoring to Radio skill, fixing an ugly hack that I used in …