Added methods to findAll reports by type and some code clean up.