Refactor some logic, alter output to match radius-report more closely.