Improved result preprocessing