More const

You need more const in your code.