Register/Edit rain barrel cleanup.

Separated methods for easier reading.