Minor rename
Extracted methods