Fixed up reports name, again. Also refactored some code.