Small refactor of methods