Some code cleanup
Add UIView+CDSBorder category for debugging