Cleaned up find_vpc() method