Refactor, group methods into helper modules