removed a lot of ornamental/useless <const> storage class