add guard, private classes
Merge pull request #7 from jlambert121/cleanup

add guard, private classes