Checking if already defined.
Minor style fixes.
Updating ignore list.