Clean up
Use a vector to store MapParser values
Clean up