Add const modififer wherever appropriate