Fix comments and code