Implemented changes about comments