Cleaned up comments. Made map code cleaner.