Fix comments and rewrite __call method.
Fix call method.