Formatting
Clean up save()/output() methods