Maps sorted - minor improvement