cleaned up some code
Merge pull request #636 from candlepin/ckozak/cleanup

cleaned up some code