File store increment/decrement
Don't use extract
Cleaning up code.