refactor helper method
Merge branch 'skwak'