Refactor private methods