Replaced variables with constants where possible