Made certain variables const