constify

Change-Id: If9866d25b228a5b84844943c17406c10f2c8515d
speed optimisation

Change-Id: I8f27adf834e09702c609170e63facb1ec1ea0ab7