refactored some output options