Cleaned up and commented map a little