Cleaned up Output Formatting and Imports