Adding comments and fixing magic method access by ref