Cleanup
Bad sorting
Fix line breaks
Updates
Fixes