even more attempts at making CC happy
Merge pull request #50 from theckman/even_more_refactor

even more attempts at making CC happy