Fix const to object pointers
Less verbose code