Added some formatting for comments. Changed locations to a map