Use const in more places