fix variables polluting the namespace (@taromorimoto)