dev incrementer/decrementer + refactoring