Cleanup (arrangement; aggressive logging)
Cleanup (common URL check code extracted)