New line fix
Cleanup
Less verbose