Some code cleaning. Redefining some outputs.