Cleaned up the companion map code. Not strings anymore