Sanitize formatting
Cleanup