Reduced dependencies, improved result transformer