Added comment + minor improvement