Slight output refactor