Polishing code for first publish.