Cleared out some extra reporting code and fixed the array logic
Adding some code clean up
Fixing merge conflic