Completed distractors
Finished refactor
Merge pull request #1 from sdrhoads/commentsAndRefactor

Comments and refactor