Replaced a lot of hardcoded values with variables