Minor refactor of report