Cleanup: Private member naming with underscore prefix