Fix comments and names