Resolved a magic-id deprecation warning.
Some general code/comment cleanup.
Version => 2.2.0