Some minor polishing