Metadata --use-local-forwarder support + improving code quality