Further cleaning up of the string formating