Merge pull request #57 from moorereason/simplify

Fix a couple issues found by gosimple