Updated formatter