Refactor/stock count form