Replaced hard-coded values with references to variable data