refactor + adding command line reporter