Refactored some report stuff to clean things up and prepare for proper use of builder pattern.