Rename variables + pulling magical numbers into constants