Better coding standards.
Added config option outputMode