more reshuffling of methods (no functional change)