More updated formatter