Small refactoring
Different output system