Remove a few unwanted large line breaks
Remove unwanted nested level in ML tasks
Several beautifications