Moved formatting code into helpers.h