Refactor: Use dropWhile instead of reimplementing