Fix comments, instantiation usage