Fix rest formating