Comment and tidy code of location collection class