Improved readability of expandFormat function

cleanup

Cleanup

Make jshint happy

Remove additional spaces