Refactoring and more consistent output