Move logic out of class helper method

I don't think we should have any logic in the helper class method. I've moved it into the actual class instead. 

Thoughts?