Removed some extra var declarations