Use const where needed