Merge pull request #58 from jeremyBass/master

refactor and clean up of reported items