capitilizing Cyclomatic Complexity - closes #10
closes #8