Replaced more numeric values with constants