Small improvements on format
Fixing format