Clean up formatting functions

8 jobs for !43 with fix_logsi in 2 minutes and 1 second (queued for 1 second)
latest merge request