Stock count/refactor/fix indentation