Use some helper methods
Merge branch 'using-some-helper-methods'