Fix CrossMap datastructure GetByFirst and Second keys and do some code formatting