Clean up and organize code for ReportOptionsActivity