Reorder particle bits. Refactor to helper

-Dx