REFACTOR various methods to call methods