Minor comment reorganization