Improvements for Readability
Added in options for output enabling