Stop using const