Redo handling of formatting, allow to specify options and allow for simpler calls