Replace static helper methods
Merge pull request #1244 from thejameskyle/remove-static-helpers

Replace static helper methods