Refactor to create constants for common values to be replaced Signed-off-by: Walker Selby <git@walkerselby.com>