Output refactoring and filter restyle