Minor code revisions

Just some minor updates to the code base.  Added in revisions to give the ENMCircle class more clarity composer