Move helpers to simple helper methods