Fix duplicate var declarations