Cleaned up mapmaker