Update formatting and return