little cleanup, improved result format