DEV: Remove const when not passing by reference