Clean the code a little bit and add some output informations.