Better const usage