Change: Restructured internal method (names) for better readability