Slight Refactor of Report Writer to clean up some duplicated code and to prepare for additional pages