Refactor to fix several lines of logic
Merge pull request #4 from cs-555/fixBaseline

Refactor to fix several lines of logic