Tidy and update to use single variable instead of hardcoded everywhere