Refactor code
Add flexible particle parameters