cleaned up map a bit
tempcommit