Add comments, add type hint for arguments, add global entity