Since Map<String, Site> getSiteMap(Environment env) never returns null, some improvements can be made in the calling methods.
Since Map<String, Site> getSiteMap(Environment env) never returns null, some improvements can be made in the calling methods.