Enhancement: Restructured helper methods for a cleaner public API