Better cleanup of output/proccesses.

Reorganized some things.
Removed redundant part of name.