Cleaned up helpers a bit
Merge pull request #48 from Factlink/cleanup-helpers

Cleaned up helpers a bit