Cleaned Up MapInfo.cs