Use sinks and toString instead of manual format