pretty formatting improvement
more changes