Add pad_border param to CLOUDFLOW2. Refactor CLOUDFLOW2.