Redid formatting string fixes to not be insane