Refactored splitting logic into single methods