Adding blocks to one line if statements, and a for statement
Added conditional for delegate for clarity
Added some IP address tests back in and fixed their warnings
Renaming to use caps for abbreviation