Refactored pump state / mode