Changed a bit of code in the Outputter

This didn't fix it, just making things cleaner.