Feature/cleanse output