Refactored and optimized splitters