StockManager refactor pass1
Refactor of various small formatting issues in source code