Reorganizing code
Adding analysis message to command line output