Attempting to clean up the end points with a formatter and format interface