Cleaned up map in table