Minor cleanup of radio controller